bitkeeper revision 1.1159.174.2 (4199eab3BFgYlgf6yBL0RuSb19gzGA)

Fix CONFIG_4KSTACKS kernel config option, and add it do default config.

diff --git a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig
index 44797f293ec7db3946867a8e159e3519e0fc4faf..1532ab3dfb7eebeb7087e465e3a4c84de3569054 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -158,7 +158,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_4KSTACKS is not set
+CONFIG_4KSTACKS=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_STD_RESOURCES=y
 CONFIG_PC=y

diff --git a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig
index 1d1ec8135a188e3bfe41a5974f719335f49838fe..24c57a3f50059348e61d27e271afea91aa65eaab 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig
+++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig
@@ -119,7 +119,7 @@ CONFIG_HAVE_DEC_LOCK=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_4KSTACKS is not set
+CONFIG_4KSTACKS=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_STD_RESOURCES=y
 CONFIG_PC=y

diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
index 0041caa9bf7182df07cfc020775d0303d36974c9..9648518ae812053e74b6ca196b1d328c4d017048 100644 (file)
--- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
@@ -467,6 +467,8 @@ void __init init_IRQ(void)
 {
     int i;
 
+    irq_ctx_init(0);
+
     spin_lock_init(&irq_mapping_update_lock);
 
     /* No VIRQ -> IRQ mappings. */